Merge with xen-ia64-unstable.hg.
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 23 Feb 2007 10:38:33 +0000 (10:38 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 23 Feb 2007 10:38:33 +0000 (10:38 +0000)

Trivial merge